Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Sep 2011 17:02:18 +0000 (10:02 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 5 Sep 2011 17:02:18 +0000 (10:02 -0700)

Trivial merge